Skip to content

Add dependencies for two-factor authentication in Icinga Web#53

Merged
lippserd merged 2 commits intomainfrom
feature/2fa
Apr 30, 2026
Merged

Add dependencies for two-factor authentication in Icinga Web#53
lippserd merged 2 commits intomainfrom
feature/2fa

Conversation

@Jan-Schuppik
Copy link
Copy Markdown
Contributor

@Jan-Schuppik Jan-Schuppik commented Aug 4, 2025

Add the packages required by the icingaweb2 feature Two Factor Authentication V2.

Packages:

Copy link
Copy Markdown
Member

@Al2Klimov Al2Klimov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • There are merge conflicts
  • composer.lock is unchanged
  • chillerlan/php-qrcode is under Apache-2.0 which is incompatible with GPL-2.0

jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 1, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 2, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 2, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
@jrauh01
Copy link
Copy Markdown
Contributor

jrauh01 commented Dec 9, 2025

I switched the library for QR code generation to endroid/qr-code which is under MIT license and therefore compatible with GPL-2.0.

This library requires the GD extension for php!

jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 9, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 9, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 9, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 11, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 12, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Dec 12, 2025
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
@nilmerg
Copy link
Copy Markdown
Member

nilmerg commented Jan 12, 2026

Please rebase and remove the vendor files. If you want to share a build with someone, please create a different branch.

@lippserd
Copy link
Copy Markdown
Member

@Jan-Schuppik @jrauh01 We no longer have license issues as Icinga Web is now GPLv3 - is the library decision final? In any case, please rebase.

jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Apr 21, 2026
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
@lippserd lippserd changed the title Add: packages to generate OTP tokens & QR codes Add dependencies for two-factor authentication in Icinga Web Apr 23, 2026
jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Apr 30, 2026
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
@jrauh01
Copy link
Copy Markdown
Contributor

jrauh01 commented Apr 30, 2026

Just rebased. The library decision is now final.

jrauh01 added a commit to Icinga/icingaweb2 that referenced this pull request Apr 30, 2026
Requires `endroid/qr-code` library in
Icinga/icinga-php-thirdparty#53.

Because we use **GPL-2.0** license for Icinga Web:

- `chillerlan/php-qrcode: **Apache-2.0** (incompatible)
- `endroid/qr-code`: **MIT** (compatible)
@lippserd
Copy link
Copy Markdown
Member

@jrauh01 Please rebase 😆

@jrauh01
Copy link
Copy Markdown
Contributor

jrauh01 commented Apr 30, 2026

Rebased! 😆

@lippserd lippserd merged commit 7acd032 into main Apr 30, 2026
1 check passed
@lippserd lippserd deleted the feature/2fa branch April 30, 2026 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants